Fix byte-to-long bitmap conversions.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index db3715989a14b042dc073215acc21ec615184e8f..df494d11437b8b9d6651de31c6a55671a0b020a9 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -525,8 +525,7 @@ void bitmap_byte_to_64(uint64_t *lp, const uint8_t *bp, int nbits)
     for (i = 0, b = 0; nbits > 0; i++, b += sizeof(l)) {
         l = 0;
         for (j = 0; (j < sizeof(l)) && (nbits > 0); j++) {
-            l <<= 8;
-            l |= bp[b+j];
+            l |= (uint64_t)bp[b+j] << (j*8);
             nbits -= 8;
         }
         lp[i] = l;

diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c
index 76f55d29e8b4d16c9b9a81f243841fd0089065a8..363572bedb320b667f29d1197c4735947f672ae4 100644 (file)
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -494,8 +494,7 @@ void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits)
        for (i = 0, b = 0; nbits > 0; i++, b += sizeof(l)) {
                l = 0;
                for (j = 0; (j < sizeof(l)) && (nbits > 0); j++) {
-                       l <<= 8;
-                       l |= bp[b+j];
+                       l |= (unsigned long)bp[b+j] << (j*8);
                        nbits -= 8;
                }
                lp[i] = l;